From 8ce6ba37d6bd8959e0d00b92103c85cc662f6afd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Tue, 2 Oct 2018 17:01:41 +0200 Subject: [PATCH] x86/iommu: fix wrong usage of iommu_hwdom_inclusive MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit iommu_hwdom_inclusive was used where iommu_hwdom_reserved should be used. Reported-by: Suravee Suthikulpanit Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 2 +- xen/drivers/passthrough/x86/iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index ae6cf2f0ff..8f4309760a 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -157,7 +157,7 @@ static int __init parse_dom0_iommu_param(const char *s) else if ( (val = parse_boolean("map-inclusive", s, ss)) >= 0 ) iommu_hwdom_inclusive = val; else if ( (val = parse_boolean("map-reserved", s, ss)) >= 0 ) - iommu_hwdom_inclusive = val; + iommu_hwdom_reserved = val; else rc = -EINVAL; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index b7c8b5be41..69e45b8e00 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -210,7 +210,7 @@ void __hwdom_init arch_iommu_hwdom_init(struct domain *d) BUG_ON(!is_hardware_domain(d)); - ASSERT(iommu_hwdom_inclusive != -1 && iommu_hwdom_inclusive != -1); + ASSERT(iommu_hwdom_inclusive != -1 && iommu_hwdom_reserved != -1); if ( iommu_hwdom_inclusive && !is_pv_domain(d) ) { printk(XENLOG_WARNING -- 2.30.2